Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 5 Jul 2010 11:22:19 +0000 (11:22 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 5 Jul 2010 11:22:19 +0000 (11:22 +0000)

Trivial merge